Skip to content

Conversation

TimNN
Copy link
Contributor

@TimNN TimNN commented Dec 5, 2024

LLVM has recently added support for the lime1 CPU in llvm/llvm-project@35cce40, so the target-cpus.rs test currently produces different output depending on the LLVM version.

This CL adds a normalization directive, to remove the new CPU from the output list.

Alternatives fixes I can think of:

  • Add two revisions of the test (one per LLVM version)
  • Ignore the test on one of the LLVM versions
    • I dislike this, because it's possible that the test won't get updated for the next LLVM version.

I don't think the exact list of target CPUs is relevant for this test, so it shouldn't be too bad if the normalization sticks around longer than necessary.

@rustbot label: +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented Dec 5, 2024

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 5, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Dec 5, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, one question

@jieyouxu
Copy link
Member

jieyouxu commented Dec 5, 2024

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2024
@TimNN
Copy link
Contributor Author

TimNN commented Dec 5, 2024

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 5, 2024
@TimNN TimNN requested a review from jieyouxu December 5, 2024 14:41
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jieyouxu
Copy link
Member

jieyouxu commented Dec 5, 2024

r? jieyouxu @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 5, 2024

📌 Commit 9aa4be0 has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned fmease Dec 5, 2024
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2024
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#132155 (Always display first line of impl blocks even when collapsed)
 - rust-lang#133256 (CI: use free runners for i686-gnu jobs)
 - rust-lang#133607 (implement checks for tail calls)
 - rust-lang#133821 (Replace black with ruff in `tidy`)
 - rust-lang#133827 (CI: rfl: move job forward to Linux v6.13-rc1)
 - rust-lang#133910 (Normalize target-cpus.rs stdout test for LLVM changes)
 - rust-lang#133921 (Adapt codegen tests for NUW inference)
 - rust-lang#133936 (Avoid fetching the anon const hir node that is already available)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e82ee96 into rust-lang:master Dec 6, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2024
Rollup merge of rust-lang#133910 - TimNN:llvm-target-cpus, r=jieyouxu

Normalize target-cpus.rs stdout test for LLVM changes

LLVM has recently added support for the `lime1` CPU in llvm/llvm-project@35cce40, so the `target-cpus.rs` test currently produces different output depending on the LLVM version.

This CL adds a normalization directive, to remove the new CPU from the output list.

Alternatives fixes I can think of:

* Add two revisions of the test (one per LLVM version)
* Ignore the test on one of the LLVM versions
  * I dislike this, because it's possible that the test won't get updated for the next LLVM version.

I don't think the exact list of target CPUs is relevant for this test, so it shouldn't be too bad if the normalization sticks around longer than necessary.

`@rustbot` label: +llvm-main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants